auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 21 Dec 2012 05:50:54 +0000 (06:50 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 21 Dec 2012 05:50:54 +0000 (06:50 +0100)

Trivial merge